From 5a12551454877eca4cf0e6e20b74b6469f2c1bb2 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Thu, 11 Dec 2025 19:26:02 +0100 Subject: [PATCH] [PATCH] remove JITC_PROCESSOR_TYPE export for powerpc long obsolete; there's no IBM JDK for 32-bit ppc anymore. And it breaks creating instdir/program/soffice with +x by cp (sed doesn't keep the permission, obviously) Change-Id: I9e8ffc6017056adb5142099a661761c2caaa87c4 Gbp-Pq: Name remove-JITC_PROCESSOR_TYPE-setting.diff --- config_host.mk.in | 1 - configure.ac | Bin 589414 -> 589211 bytes desktop/CustomTarget_soffice.mk | 4 ---- desktop/scripts/soffice.sh | 2 -- 4 files changed, 7 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index b7955d9940d..8c98cea76d1 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -389,7 +389,6 @@ export JDK=@JDK@ export JDK_FOR_BUILD=@JDK_FOR_BUILD@ export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=@JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD@ export JFREEREPORT_JAR=@JFREEREPORT_JAR@ -export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@ JOM=@JOM@ export JQ=@JQ@ export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@ diff --git a/configure.ac b/configure.ac index fcabb099c6b1b23c10e6351cdfb85abe28d8dd5c..cfa9ce46fdc75786bc42c2e8255af3ba5e7d2bbd 100644 GIT binary patch delta 39 qcmaF%M|t*d<%Sl<7N!>FEiBbH+TCul05K~NvjH*tcDI`x3aS8S+Yqe) delta 228 zcmbRJTlv`^<%Sl<7N!>FEiBbH#JoI1oZ|z6{GDBcgZ+czLm~rQZIzU!f85U|Ta zS6ZQ@pqr?mq>_71^GoK3Ro0yr72``IXcG&hdKp^XhdUC5!+sIg9V6L QftU@5*|%5R;80ct01)U&od5s; diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index 26e661ec39d..0c895c77afc 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -35,11 +35,7 @@ $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \ | $(gb_CustomTarget_workdir)/desktop/soffice/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) -ifneq ($(JITC_PROCESSOR_TYPE),) - sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@ -else cp $< $@ -endif $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) endif diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 7188f393e14..1f3c4cd1f0e 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -37,8 +37,6 @@ export SAL_ENABLE_FILE_LOCKING # uncomment line below if you encounter problems starting soffice on your system # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS -#@JITC_PROCESSOR_TYPE_EXPORT@ - # resolve installation directory sd_cwd=$(pwd) sd_res="$0" -- 2.30.2